fixes to receipting behaviour

some more to do...