First pass of fixes on the contract side

Worked through the first round of contract fixes and merged the branch back in. Nothing glamorous — getting the round logic to behave the way the interface assumes it does.