various bug fixes, the very start of the proxy block.