Helping Tim Fix code
Errors we didn't fix yet: - line ~1139 --> uu674[12] wasn't happy.