TextField fixes, lots