Cleaning up some more.
Update to 1.2