wrapping up with minor changes