kick() and mode() improvements