some more minor major fixes