Extend moab options

Minor code cleanup and 3 new config options added