Added removal and fixed saving