Minor changes to file saving, small misc updates