cleanup, add missings