Various bug fixes, end of day Friday, July 18