I don't exactly know what this is, but I think I fixed a bug or two that is in the original (unless those were intended)
