bug fixes, minor features.