a quick pass over this material

but it's still very choppy.