added more minor changes