Some cleanup and updates.