some more major fixes