diff --git a/project/java/DataDownloader.java b/project/java/DataDownloader.java
index d9d8ad87a..d4def87e9 100644
--- a/project/java/DataDownloader.java
+++ b/project/java/DataDownloader.java
@@ -276,6 +276,10 @@ class DataDownloader extends Thread
 		{
 			try {
 				stream = new CountingInputStream(Parent.getAssets().open(url));
+				while( stream.skip(65536) > 0 ) { };
+				totalLen = stream.getBytesRead();
+				stream.close();
+				stream = new CountingInputStream(Parent.getAssets().open(url));
 			} catch( IOException e ) {
 				Status.setText( res.getString(R.string.error_dl_from, url) );
 				return false;
diff --git a/project/jni/application/alienblaster/AndroidAppSettings.cfg b/project/jni/application/alienblaster/AndroidAppSettings.cfg
index f391a5edf..e2442d2b9 100644
--- a/project/jni/application/alienblaster/AndroidAppSettings.cfg
+++ b/project/jni/application/alienblaster/AndroidAppSettings.cfg
@@ -23,7 +23,7 @@ AppVersionCode=110013
 AppVersionName="1.1.0.13 - fixed crashes for some devices"
 CompiledLibraries="sdl_mixer sdl_image"
 CustomBuildScript=n
-AppCflags='-finline-functions -O2'
+AppCflags='-O3'
 AppLdflags=''
 AppSubdirsBuild=''
 AppUseCrystaXToolchain=n
diff --git a/project/jni/application/enigma/AndroidAppSettings.cfg b/project/jni/application/enigma/AndroidAppSettings.cfg
index d236d6e6e..970e90306 100644
--- a/project/jni/application/enigma/AndroidAppSettings.cfg
+++ b/project/jni/application/enigma/AndroidAppSettings.cfg
@@ -23,7 +23,7 @@ AppVersionCode=1
 AppVersionName="0.1"
 CompiledLibraries="sdl_mixer sdl_image sdl_ttf intl lua png xerces"
 CustomBuildScript=n
-AppCflags='-finline-functions -O2'
+AppCflags='-Os'
 AppLdflags=''
 AppSubdirsBuild=''
 AppUseCrystaXToolchain=y
diff --git a/project/jni/application/opentyrian/AndroidAppSettings.cfg b/project/jni/application/opentyrian/AndroidAppSettings.cfg
index 0472ddcb2..05795f05f 100644
--- a/project/jni/application/opentyrian/AndroidAppSettings.cfg
+++ b/project/jni/application/opentyrian/AndroidAppSettings.cfg
@@ -23,7 +23,7 @@ AppVersionCode=2116
 AppVersionName="2.1.16 - fixed crashes for some devices"
 CompiledLibraries="sdl_net"
 CustomBuildScript=n
-AppCflags='-finline-functions -O2'
+AppCflags='-O3'
 AppLdflags=''
 AppSubdirsBuild=''
 AppUseCrystaXToolchain=n
diff --git a/project/jni/application/sc2/AndroidAppSettings.cfg b/project/jni/application/sc2/AndroidAppSettings.cfg
index 80b1b87a7..df0c06381 100644
--- a/project/jni/application/sc2/AndroidAppSettings.cfg
+++ b/project/jni/application/sc2/AndroidAppSettings.cfg
@@ -23,7 +23,7 @@ AppVersionCode=06916
 AppVersionName="0.6.9.16 - fixed crashes for some devices"
 CompiledLibraries="sdl_image tremor ogg"
 CustomBuildScript=n
-AppCflags='-O2 -finline-functions -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1 -DHAVE_JOYSTICK=1 -DDIRECTIONAL_JOYSTICK_MELEE=1'
+AppCflags='-O3 -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1 -DHAVE_JOYSTICK=1 -DDIRECTIONAL_JOYSTICK_MELEE=1'
 AppLdflags=''
 AppSubdirsBuild=''
 AppUseCrystaXToolchain=n
diff --git a/project/jni/application/teeworlds/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg
index f88b7d958..5adde9152 100644
--- a/project/jni/application/teeworlds/AndroidAppSettings.cfg
+++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg
@@ -23,7 +23,7 @@ AppVersionCode=5203
 AppVersionName="0.5.2.03 - fixed crashes for some devices"
 CompiledLibraries="sdl_image freetype"
 CustomBuildScript=n
-AppCflags='-O2'
+AppCflags='-O3'
 AppLdflags=''
 AppSubdirsBuild=''
 AppUseCrystaXToolchain=n
diff --git a/project/jni/flac/Android.mk b/project/jni/flac/Android.mk
index 3c1d9839d..11e5db6cb 100644
--- a/project/jni/flac/Android.mk
+++ b/project/jni/flac/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := flac
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH) -DHAVE_CONFIG_H -DFLAC__LPC_UNROLLED_FILTER_LOOPS -I$(LOCAL_PATH)/../ogg/include
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH) -DHAVE_CONFIG_H -DFLAC__LPC_UNROLLED_FILTER_LOOPS -I$(LOCAL_PATH)/../ogg/include
 
 ifeq "$(TARGET_ARCH_ABI)" "armeabi"
 LOCAL_CFLAGS += -DFLAC__INTEGER_ONLY_LIBRARY
diff --git a/project/jni/freetype/Android.mk b/project/jni/freetype/Android.mk
index 80825b206..05bc77555 100644
--- a/project/jni/freetype/Android.mk
+++ b/project/jni/freetype/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE := freetype
 
 APP_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src -type d))
 
-LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
+LOCAL_CFLAGS := -Os $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
 				-I$(LOCAL_PATH)/include -DFT2_BUILD_LIBRARY
 
 
diff --git a/project/jni/intl/Android.mk b/project/jni/intl/Android.mk
index 3db76a087..f6544800d 100644
--- a/project/jni/intl/Android.mk
+++ b/project/jni/intl/Android.mk
@@ -8,7 +8,7 @@ APP_SUBDIRS := src
 
 # Add more subdirs here, like src/subdir1 src/subdir2
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include -DBUILDING_LIBINTL -DBUILDING_DLL \
+LOCAL_CFLAGS := -Os -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include -DBUILDING_LIBINTL -DBUILDING_DLL \
                 -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY \
                 -Dset_relocation_prefix=libintl_set_relocation_prefix \
                 -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 \
diff --git a/project/jni/lua/Android.mk b/project/jni/lua/Android.mk
index 8894a17db..db112846c 100644
--- a/project/jni/lua/Android.mk
+++ b/project/jni/lua/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := lua
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/mad/Android.mk b/project/jni/mad/Android.mk
index 1d613311c..b60ed81e1 100644
--- a/project/jni/mad/Android.mk
+++ b/project/jni/mad/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := mad
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include \
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include \
 					-DFPM_64BIT -DOPT_SPEED \
 					-DSTDC_HEADERS -DHAVE_UNISTD_H \
 					-DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 \
diff --git a/project/jni/ogg/Android.mk b/project/jni/ogg/Android.mk
index ae4a927d5..c330ee77f 100644
--- a/project/jni/ogg/Android.mk
+++ b/project/jni/ogg/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := ogg
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include
 
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/project/jni/png/Android.mk b/project/jni/png/Android.mk
index 05bbd0df5..aa8485c8d 100644
--- a/project/jni/png/Android.mk
+++ b/project/jni/png/Android.mk
@@ -21,7 +21,7 @@ common_SRC_FILES := \
 	pngwtran.c \
 	pngwutil.c
 
-common_CFLAGS := ## -fomit-frame-pointer
+common_CFLAGS := -O3
 
 common_C_INCLUDES += $(LOCAL_PATH)/include
 
diff --git a/project/jni/sdl-1.3/Android.mk b/project/jni/sdl-1.3/Android.mk
index 536c02d4f..d3f3b5453 100644
--- a/project/jni/sdl-1.3/Android.mk
+++ b/project/jni/sdl-1.3/Android.mk
@@ -8,7 +8,7 @@ ifndef SDL_JAVA_PACKAGE_PATH
 $(error Please define SDL_JAVA_PACKAGE_PATH to the path of your Java package with dots replaced with underscores, for example "com_example_SanAngeles")
 endif
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH)/include \
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include \
 	-DSDL_JAVA_PACKAGE_PATH=$(SDL_JAVA_PACKAGE_PATH) \
 	-DSDL_CURDIR_PATH=\"$(SDL_CURDIR_PATH)\" \
 	-DSDL_TRACKBALL_KEYUP_DELAY=$(SDL_TRACKBALL_KEYUP_DELAY) \
diff --git a/project/jni/sdl_blitpool/Android.mk b/project/jni/sdl_blitpool/Android.mk
index 054bbccf1..54d957653 100644
--- a/project/jni/sdl_blitpool/Android.mk
+++ b/project/jni/sdl_blitpool/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_blitpool
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/sdl_gfx/Android.mk b/project/jni/sdl_gfx/Android.mk
index fd9f6a380..da20afa50 100644
--- a/project/jni/sdl_gfx/Android.mk
+++ b/project/jni/sdl_gfx/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_gfx
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. \
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. \
                 -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include -Os
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/project/jni/sdl_image/Android.mk b/project/jni/sdl_image/Android.mk
index bbf19aa7a..adf2a10f5 100644
--- a/project/jni/sdl_image/Android.mk
+++ b/project/jni/sdl_image/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_image
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../jpeg/include -I$(LOCAL_PATH)/../png/include -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../jpeg/include -I$(LOCAL_PATH)/../png/include -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
 				-DLOAD_PNG -DLOAD_JPG -DLOAD_GIF -DLOAD_BMP
 
 LOCAL_CPP_EXTENSION := .cpp
diff --git a/project/jni/sdl_mixer/Android.mk b/project/jni/sdl_mixer/Android.mk
index 8d10aa82f..4f02ccb1b 100644
--- a/project/jni/sdl_mixer/Android.mk
+++ b/project/jni/sdl_mixer/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_mixer
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include \
 				-I$(LOCAL_PATH)/../mad/include -I$(LOCAL_PATH)/../flac/include -I$(LOCAL_PATH)/../ogg/include -I$(LOCAL_PATH)/../vorbis/include -I$(LOCAL_PATH)/../tremor/include \
 					-DWAV_MUSIC -DOGG_USE_TREMOR -DOGG_MUSIC -DFLAC_MUSIC
 
diff --git a/project/jni/sdl_net/Android.mk b/project/jni/sdl_net/Android.mk
index c51c18f22..5fa1d95c5 100644
--- a/project/jni/sdl_net/Android.mk
+++ b/project/jni/sdl_net/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_net
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/include
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/sdl_ttf/Android.mk b/project/jni/sdl_ttf/Android.mk
index b744f2447..27fc54d5b 100644
--- a/project/jni/sdl_ttf/Android.mk
+++ b/project/jni/sdl_ttf/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := sdl_ttf
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/../freetype/include -I$(LOCAL_PATH)/include
+LOCAL_CFLAGS := -Os -I$(LOCAL_PATH) -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include -I$(LOCAL_PATH)/../freetype/include -I$(LOCAL_PATH)/include
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/stlport/Android.mk b/project/jni/stlport/Android.mk
index 2a1bd7436..b5e4293aa 100644
--- a/project/jni/stlport/Android.mk
+++ b/project/jni/stlport/Android.mk
@@ -8,7 +8,7 @@ ifneq ($(CRYSTAX_TOOLCHAIN),)
 LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES := dummy.c
 else
-LOCAL_CFLAGS := -I$(LOCAL_PATH)/stlport -I$(LOCAL_PATH)/src
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/stlport -I$(LOCAL_PATH)/src
 LOCAL_CPP_EXTENSION := .cpp
 LOCAL_SRC_FILES := $(addprefix src/,$(notdir $(wildcard $(LOCAL_PATH)/src/*.cpp $(LOCAL_PATH)/src/*.c)))
 endif
diff --git a/project/jni/tremor/Android.mk b/project/jni/tremor/Android.mk
index b4251226b..965be5131 100644
--- a/project/jni/tremor/Android.mk
+++ b/project/jni/tremor/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := tremor
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -DHAVE_ALLOCA_H -I$(LOCAL_PATH)/../ogg/include/ogg -I$(LOCAL_PATH)/../ogg/include -I$(LOCAL_PATH)/include/tremor
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH) -DHAVE_ALLOCA_H -I$(LOCAL_PATH)/../ogg/include/ogg -I$(LOCAL_PATH)/../ogg/include -I$(LOCAL_PATH)/include/tremor
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/vorbis/Android.mk b/project/jni/vorbis/Android.mk
index 9249cd0a5..8fd9bdf4c 100644
--- a/project/jni/vorbis/Android.mk
+++ b/project/jni/vorbis/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := vorbis
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/src -I$(LOCAL_PATH) -DHAVE_CONFIG_H -I$(LOCAL_PATH)/../ogg/include
+LOCAL_CFLAGS := -O3 -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/src -I$(LOCAL_PATH) -DHAVE_CONFIG_H -I$(LOCAL_PATH)/../ogg/include
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/xerces/Android.mk b/project/jni/xerces/Android.mk
index ed81bf888..01e0cb90b 100644
--- a/project/jni/xerces/Android.mk
+++ b/project/jni/xerces/Android.mk
@@ -6,7 +6,7 @@ XERCES_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src/
 
 LOCAL_MODULE := xerces
 
-LOCAL_CFLAGS := -DHAVE_CONFIG_H -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/..
+LOCAL_CFLAGS := -Os -DHAVE_CONFIG_H -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/include -I$(LOCAL_PATH)/..
 
 LOCAL_CPP_EXTENSION := .cpp
 
diff --git a/project/jni/xml2/Android.mk b/project/jni/xml2/Android.mk
index 5be91ead7..fd5aed6e5 100644
--- a/project/jni/xml2/Android.mk
+++ b/project/jni/xml2/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := xml2
 
-LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include
+LOCAL_CFLAGS := -Os -I$(LOCAL_PATH) -I$(LOCAL_PATH)/include
 
 LOCAL_CPP_EXTENSION := .cpp