Some more docs, and bug fixes so they are correct