Fix and text addictions/optimizations