Changed to do regex word checking for armor names; some minor changes

[nb097]

Don't feel compelled to include this - it works for my purposes but you might find it too draconian.