Long option processing now works, next step clean up of this horrid code