cleaned up some glitches