Update LoadFile() and small remarks