Added switches to command line arguments, fixed issue with hostname