dataset parser fixes and additions