hopefully fixed some text field stuff
merge