Fixes, edits, some advanced material.