Improve command line arguments, remove maps from source.