fixed bugs caused by upgrade to Touch build 16360