testing on ipad and iphone and fix bugs