major fixes
major fixes