Correct version/history and add in recent changes