lots of changes and final edition things