First draft final tweaks