cleanup + bugfix for "big" ip adresses