More fixing :D!
Still not fixed though, quite segfaulty.