fixed some raw data typos
added TODO