Tweaks to better handle a new competition

I did not bother with making things look good, and I did not write any
tests. I am a bad person
Merge branch 'new-competition'
Merge branch 'master' into production