Some enhancements and iPad support