fixes and updates tested on iPad