Updates

* Added more features and bug fixes