Ed: fix comments...