lots of updates / prep