Allow for DATA_URL to work

Allow for DATA_URL to work
Fixed coding errors
Fixed bug that ignored options
Merge branch 'dgutie02-patch-1'