Add in kick message, various cleanups