Documentation Update Part 2

This should finally do it, I hope.