Add #dump, fix #save, tidy comments