Tidying up submit messages. Closes #12