cleaned up some code, put updating gui in handler, added touch even