straightened out ios and Android issues