Fix #14, #15.

Oh god what the fuck did I do with Mutexes. Going back to old code is really depressing...