made more minor changes