misc bugfix; new methods