fixed a lot of issues for 3.7.3. Improved text A/FD