bugfix + removed bugged stuff