Revert "many fixes"

This reverts commit 56b80da065782247a2018243b4f931f64eb51a90.