Tons of edge case fixes and default file loading