Refine grammar, change whitespace handling, add string literals