Applying fix for #78
Adding fixes for #79, #78, and #80
Updating the messages