more touch and cleanup