Tons of minor updates