- Fixed a few things for 1.2 release