More dynamic wind speed model + added wind field models