Bug fixes and improvements.

Fixing various issues and completing touch task list template (Evan)