Add missing forms
Add simple check for detecting unknown flags