more admin cleanup and debugging