slow tweaks and fixes