REG: Removed option codes, MOD: Reworked input mechanism, NEW: Added error checking against input values