Fixed a couple of glitches.