Some corrections dealing with (Order) block; still does not quite work properly, yet.