forward bundles
add new spellings
fine-tune file masks