Yes, ArmorArmadillo you're right on both counts.

I should just delete all that guff about bites and allow the Natural Weapons rules to cover it.

I think I'll give them Endurance as an extraordinary ability. Plus a +2 racial bonus to saving throws against Enchantment, given that they are such angry little fellows.