Revert "hell lot of fixes #469 #427 #482 #466 and others"

This reverts commit dc9b0b3ac7eee026140d8ad5fdcccbdce9679e2d.