fix some bugs and start adding new features