Texture initialisation changed (still need to figure out how to use vanilla textures in this new way), cleanup and fixes