Add Hurricane kick, and some small changes