fixes during code review (part 1)