Added AmbiBox to MP2, fixed bug in AmbiBox handler