More general modifications, title changes, and fixes.