Nearly everything updated