Wiring to correct change events and adding persistance of settings