remove old comments
minor tweaks and fixes