Milestone 3 - compact view of remaining updates

[wertikalk]

Description

Eliminates merge conflicts, and simplifies things.

• Closes: #33 #32

• Also, contains changes from: https://github.com/filecoin-project/filecoin-solidity/pull/39