Better comments
Generalize handling of missing specs