some more android fixes works almost