simplify shower builder, debug AddCluster in Track