new functionality and bug fixes