Various stuff

- Forgot what and why I changed it...lol...been too long