bug fix and changed all link to local