some random changes i made ages ago (v2.51)