a few small changes suggested by mgeier