Added server selection, a few more commands, etc.