Revisions, especially to world model