Fix rendering of missing IPs
Update abbreviation rules and test data
Cleanup