Fixed more issues with stupid bugs