major fixes
o