adding fixes from audionerd so I can use this before the fixes are pushed