android minor fixes, added iOS code, must try