Debug + UI tweaks.