Lots of core changes, bc revert protocolv2