Modified embeded config file and tweaked argument parsing