First updates and fixing links