Fixes and new features.