Improved Compute; see also to Google-docs list for what has been done

https://docs.google.com/document/d/13umeauL2B8gqg3-c5UDTOYBJtCrTS7e8HNrIWMqX6uw/edit