fix issues from code review with joel