fixed several quirks with android
fixed several quirks with android