Some cleanup and I still need to fix block textures.