start rewriting quasyquote syntax
Minor updates