Merged in changes, updated intro.