ArchiDroid Scripts Improvements
More improvements