merged more fixes