merged blockchain fixes from wozz