Minor updates to iPad version - still not complete