Fixed kicking for no reason & added some changes