add missing files and some more small changes