review comments

push an additional commit into the devoncarew_better_messaging branch