Added comment tokens and made the parser give more sensible error messages.