Bug fixes and new implementations.