Following upstream
Various bugfixes; added BT driver epa