Add a bit of reporting, make logic more consistent.