Bugfix and better downloader for Android