Debug

[tweaks]