Improved FormatType and WaveFile just a little