pretty much everything updated