adding more storm info and ordering things a bit