added android-file-transfer and tweaks