fixed all stuff and removed susy