major fixes

v.2