more major fixes