more codemesh edits