more tweaks and comments
test tweaks