Changes per feedback

including implementation of "--" flag to stop consuming args.