fix up AST construction for tokens
finish correcting astbuilder
tweak CLI module
get tests passing