Progress on the version 1.0, mostly the options