Made R&D server selection and commandline option