fixes #747 (closed)
Some of the conventions are a little out of date. I've updated what I thought was important.