Completed work on Generate users and cleaned up many things.