went through and made changes according to suggestions from Matt Darby