Fix to touch/mouse bugs; cleanup; more tiles added