more fixes merged