Hopefully merging my last changes with Jeremy's Save etc