added a few features and fixed some bugs