bugfixes of bugs that doesn't occured yet