Massive update

Everything should be clean expect links :smile: