Small improvements based on Jason's input, moving towards hand rolled file format

[#75135164]