Removed trash.
Smallish updates.
Almost completed Waf introduction, some updates to previous text.