First round of fixes and updates.