Huge cleanup
Got textures working