Added back isint, and fixed is_cidr