Squashed some bugs and made it look pretty.