New choice files for windows, hrv, passive solar, instand DHW. Also, updated energy analysis.