Add: Missing files and cosmetics