Added GetSelectedComputer, minor changes