Cleaned up some files.  Made changes to reduce the flickering when touched.