Cleanup and some improvements. Fix disabling bypass on kick