Tidy up code, add in new gen elvel signal plot