Bug fixes... minor new features.