some fixes and new methods