fixes after rehearsal (22 mins)