Update 2.0

Additional updates, still more to do.