some small updates per code review comments