Minor corrections

continued prototyping