gw path check + misc fixes