Implement max users option
Misc fixes