More work on debugger + cleaning entity attribute