Misc Formatting & Touch update