Huge improvements to allow display setup to beamers + small changes quite everywhere