Add support for comments and +,-,* tokens