Tweaks
Better handle kicks