minor tweaks to messages, variable names