Add all protocols
Remove hyphens
Fix IP header protocol handling