Simpler dockerfile image.
Some argument parsing cleanup.