Documentation fixes

This one includes some documentation fixes on top of #427. I messed up with the branching, so this change includes that one too.