71 Scamp surgery(s)

Few more loose ends