go path and other small changes