Bug fixes and minor features.