More work on master server and server list.