start restructuring the program options
Bug fix the recent changes