add notes
fix broken URLs
fix links; merge