some updates from before