Fixed links + added who & what