Add function -is -ip and small fix