bugs fixed and basic functionalities are ok.