v1.2

Lots of fixes