Fixed kick command (autokick is... a weird idea) & refactoring