Edited all, preparing to tidy up for final release