fixing bugs
removed debug info