Added new methods and improved others.