some updates and prep