More fixes for infinite glass, including the Saw

#241
removed waveney's m*stard
v 3.26, changelog