version 1.8.0, lots of bugfix and significative clean up