first batch of changes from code review