Added help generation and improved the parsing engine