Updated parser: added input type; completed errors