tweaks and misc