Final commit with links fixed and some other stuff done