still more fixes from rick@seismo