refine 11/24 mistakes, and adjust to final cut