Improved storms a bit
Optimized imports