latest rounds of bug fixes