Fixing iPad support and fixing bugs for the iPhone