marginalia, faster strides, cleanup