changed some more terminology. Attempted to correct classification when used in a way other than as defined