Fix problems

Also:
- Prevent /battle if they're already battling.
- Battle message cleanup