Submission check.

Forgot to include one commit in the last PR, and added something else to this one.

Also helps fix #185