bunch of updates to mux