Server list, updates, removed some debug code (again)