Misc changes

* Tweaked voice kick
* Tidied up server into