bin/skadi improvements with modifiers