Made a few of the reccomended changes from external review.