added string literal, rewrite mbs->wstr conversion
added more expression types