ios version working, small fixes