Removed duplicate messages when responding
Minor updates