+ a few touchups. Seems to be working.