more needless tweaks (added messages)
forgot to suppress intermediate messages