Add some info for commands, fix join command