fixed bugs, implemented simple commands