made some more minor changes