tweaks and comments