bug fixes continued.