Fixed rebase errors and took into account Pascals comments. Tried implementing stack trace tests for local_fill_cut, but found bug inside the opt.