all sortsa fixes