Fixed up for release
Some tweaks