3

Lots of fixes