small improvements plus first test build
added boolean token type