Completed Maintain User (as well as a lot of refactoring and other minor fixes).