fixed bugs
cleaned code
removed debug logs :)