fixed some issues we had.