variety of bug fixes