more checker, new type "x", cleanups, renames ...