Tweaks + polish