first batch of android errors eliminated