Lots of fixes, update to 0.9.2