Further cleanups and credits.