additional crash bug fixes.