Add missing files, clean