Add block break handling
Fix some names not being shown correctly
Fix some names not being shown correctly (again)
Cleanup