Added the changes from in class

Fixed several bugs involving hardcoding 7 letter words