iPad version and some fixes