Upgrade to latest cap. Fix some spacing in mainnet. Fixes #8