-major fix of bugs