add resest to policies, fix issue with save and close