small tweaks, cleaning up comments