tweaks and fixes