Some cleanup and touch adaption