Various improvements and fixes, import rig example and shelf