Improves codestr, fixes eval, cmd, comp errors