added touch handling, removed anon handlers