Finally.

Took long enough, but I THINK I kind of fixed the issue now.