improved parser, fills in missing values.