Adds editing comments & fixes text cropping logic