Fix handling of PM directed at the bot - it now responds to sender rather then itself. Plus some tidying up.