Keep data file location in Configuration
minor typos
cleans up argument handling