Misc. Fixes and Comments

The changes should all be self-explanatory.