Small cleanups, added op/kick functionality