Parsing error checking, Long names

Added parsing error checking and long names