More implementation of textfield fix.

Will take a while to fully resolve.