IP checking a lot of bug fixes