Misc tweaks

Misc tweaks, improved comments