#52 fixed remaining links