A bunch of cleanup and updates