Improve comment wording
Re-introduce removal of "wholerow" attr, with tweaks for upd s.b. views
A few extra sanity checks