made other small modifications