Fix up some potential concurrents, add explanations, general tweaks