small tweaks, comment all the things (master)