No More Rainbows: Tournament update

This update contains small additions for the upcoming tournament as well as a few minor bug fixes.