Stability pass, add experimental modules, add another rig example