Fixes links & typos

Many fixes following merge