A lot of fixes
v1.0 release