Re-work stop/drop system

Re-works stop/drop system to be more abstract, so you specify stop with message rather than a separate message action. Close more frequently after error in GUI mode.