undo incorrect assertion, and fix comments