fix CAN enums in ws20

also add more optimizations