minor changes, save and load do not work