major fixes

major fixes