bug fixes in q3