Bug fixes

Better audio track selection
Clean up of messy code
Added to checking procedure

Still unfinished.