a few tweaks to marionette usage