Cleanup.
Fixed touch bug.