Update with the latest specifications

- and clean up