fixes to adb support and random clean up