fixed certain links and placed placeholders
Fixed conflicts