finished adb, fixed minor bugs