Shockwave tweaks and new 'single robot' wrapper