Updated intro, merged some sections