more cleanup and adding jigs