some tweaks. port to android?