More buttons, faster tracking, ANDROID_HOME instead of hard wired directory