-fixed saving and setting on proper objects