many fixes and code rewrite