fix marionette errors. fix template usage