put a lock around stats, clean up some tests, make A client even slower