two crime data sets
misc
fix merge errors