Lots and lots of fixes and improvements!