Cleaning
Dynamics in canon3
Canon 3 fixes