New Features and bug fixes