some fixes
removed shit