Cleanup and some additions.

Much more shiny now.