major fixes
updates for testing