new methods and bug fixes