fixing lots of service concurrency problems, along with requisite service refactorings