big bunch of updates