another bunch of updates...