general tweaks and updates