added marionette, cleaned up app config