fixes and new methods