Fix some last minute things
Merge remote-tracking branch 'origin/master'
Post competition cleanup