Some tweaks

Still not going into second stage