fixed underscore characters being ignored.
also changed '=' token to '==' as to match project examples.