Cleanup.
WIP debug toolbar, fixed +x.