cleanup

clean up variable names, updates for ingest from most recent metadata
spreadsheet