minor fixes and prep