fixes from code review