remove the crime prefix to the files. unnecessary.
fix some of the errors in the date-string generating
fix merge conflict whoops