Few UI changes for ease of debug, etc.