4 Misc changes around state labels and some logging