first series of changes based on review comments. more to come.