Some fixes - texts should be all done