more consistent references to Van der Waals

and other similar edits (with help from Sarah)