more File Field fixes and improvements