more fixes from Ellen!