Made some small adjustments on tornado