Various tweaks and updates