Fix: missing tag
Fix: feature tags
Add: some more style