Tweaks and optimization