Some tweaks
Reorder things slightly