Update specs and comments