More armor work and fixed some texture names