Big changes toward s version 2.0 of the graphics. Some time spent with
calculation as well.