Added lots of options to input forms, cleaned up code.
Added lots of options to input forms, cleaned up code.