Minor changes. Please read the class comments...