Minor updates plus theoretically working mux control