restore !ip command and small location changes