Mass changes and fixes.