Minor fixes, including that timer now starts on user touch event