Re-arranged options to be less intimidating
Removing more CP 1.0 cruft