bugfixes for kick