Made QoL improvements to Draft 2 of Proposal