improved BAP support, still incomplete