Some tweaks, mainly trying to get the marketplace to record the latest  block