tweaks and updates
commit fix