fixes suggested by Rob!