Various cleanups, add last slide