no commits for a while
Fixed serious flaw in data parser