Cleanup, Fixed a couple things. Looks a lot better.