Can't save on rename fix + test. Various small changes.