Tweaks and updates