checking in a variety of bug fixes