Added loading textures from files

Also some minor adjustments here and there