Lots of formatting changes. New pretty pictures ;)