Modified the file reading to handle Unicode issues better.
Latest layer changes.