Fixed bugs,
-basic functionalities working now