Freshened up from more recent version, doc changes only