Final submission, amendments

Minor changes to the final submission