major fixes, p1