Address feedback on proposal, fleshing out all sections