WIP: usability enhancements for trouble state