added various tweaks after Roundhouse and performances