fixed if quotatation, also moved some word definitions

... to header file, for use in other files
more tests
some lexing utils
swap