Updated parser a bit