Samphire stuff and "fixing" the bot

I don't think I missed any commas.

Added /end to user commands list
Trying to fix the bot when someone makes an inappropriate answer or hint.