Commit 22 - 3:30

Ever more texturelocation errors :AAA
commit 23 - 3:35

Slightly early commit, but required as I've fixed a bug