fixed things seth mentioned in class
Merge pull request #27 from KennethWilke/master

fixed things seth mentioned in class