fix all the visible issues