Fixed a few flaws, fancied up a bit.

Still prior to turn in time so I decided to take advantage and do some
additional work!