more minor bug fixes.