Substantial additions/more work on cli opts