major fixes.