New bug fixes incoming! (And some more stuff)