Fixed more issues than I can remember