Improve submission & fix model errors

Closes #191, #199, #212, #193, #204, and #198

See merge request !216