Some Post-Jam fixes

This is almost the same code as what was entered in the Jam, but with a pair of fixes that make it cooler. Doesn't count as an entry in the Jam..