updates for android
fixes for android