final cleanup, add DNM source fields etc.