First draft EX stage, minor fixes and tweaks