Attempted to clear up some errors.