A bunch of misc updates