joe: some more fixes