Big refactoring on services and managers; mostly, recorder fixes