fixed some names to be more consistent with others in representing the type of a word, haven't included strings yet, will do that after we get this basic stuff to work