bug fixed

basic functionalities working