various tweaks and updates