save, error on getting key files
added missing class definitions