several more fixes