Add missing files and minor changes