Add missing break statements
Add additional debug