Cleaned up. Added AIFF output.