A bunch of fixes to finish up