Fixed a few bugs.  Tweaked the design to be more understandable.