updating map to consistent object style and table scheme
fixing flipped check on datatype
removing cruft
fixing bogus filename