Bug Fix in Configuration, and added Server tokens to cmd args.