more const cleanup, thread syncs mutable