Cleaning up input formats and making selection fields optional Fixes #133