updated some based on code review