Chris - clean up warnings and move some admin code into main for better concurrency