Fixing links and errors