Just fixed up some stuff in armor/tools for consistency's sake.