Various updates, cleanups, copatterns...