Adds more major fixes