important bug fixes