The best bugs need fixing twice

So, I missed a few controller bugs. Plus I took the opportunity to fix a speed issue and update the ampersand in the font to it... well... looked like an ampersand.