Updated retrofit application

These changes fix several issues, most importantly, the issue when attempting to make the changes persistent.  

Tested on Locally and on T&D3