addressed some more comments that I missed