Added experimental save option, minor changes