fixes per code review