Updates, cleanup, and fixes.