Lots of changes and prettying it up.