Made some minor changes and added marionette

Signed-off-by: Raymond Matos <ray.matos@medialets.com>