Added comments, refactored code, added build goodness, added more marionette commands