Tweaks and update