new methods and bugfixes