removed unnecessary events for performance reasons - especially on an iPad, and tidied the remaining events.