Resolves #715 messages are now more accurate
Fix #719 now doesn't remove capital letters