More detailed examples, naming fixes.