Some fix

D&D
property
switch-case-fallthrough