Add links + some edits