Various fixes after first print to correct a few extrusion-dependent sizes.  Some values hardcoded for now for 20mm extrusions