Fixed some stuff and added a multiplexing visitor