all sortsa bug fixes