android. minor corrections and improvements