fixed some bugs
Moved some stuff around, but for some reason, the values it is
transitioning to are totally random.  WTF