More keywords, reindent, latest chicken-builder