Misc. cleanup and documentation updates