More touch-ups and functionality