improvements to manager mode