fixes during code review