fixes from p/r comments