tweaks and polish; bug fixes