tweaks and changes