Completed load files interface, Minor fixes