fixes per code review comments