integrate + cleaned up patches, added wspd data reading control