Text this: Improvements and Applications of the Methodology for Potential Energy Savings Estimation from Retro-commissioning/Retrofit Measures /