Lotta little updates and some important additions to subcontracts