Bug fixes and new methods.