fixing cuts and various other issues
cuts are tricky