some syntactic fixes to the tokenizer, still doest not validate jshint
add brackets to tokenizer and parser