Some more touchups