integrate Roman's fixes from today