added support for file choice drop downs and improvements to error handling