chore: misc updates and improvements made while you were gone, take 2

chore: misc updates and improvements made while you were gone, take 2 #706