Don't report behind peers until they catch up. Misc other bug fixes and improvements.