small changes that Spike requested