Fixed a few bugs. Now ready for 1.2