significant bug fixes