minor mods. Took care of a TODO item.