Fixes to documentation

I'm merging all the changes so far, since I'm starting on building the beta of 6.1 and I want it to include them.