Added TouchView andbug fixes