round of changes to marciello