single quote support, cleanup

Support g()()()('al') and tighten up