ArchiDroid Scripts improvements + Onandroid