small UI and generator fixes