Made some more stuff work!

Here you go, bro!