Minor changes

Add a TODO(OOV handle)