Fix NPE with leave command, rewrite spectate command
Fixes #24