greying out the comments
more small fixes and tweaks