Following upstream
Various bugfixes and tweaks. BT shit is still not responding to my GPIO request