Add controls and comments
Rename to specification
Some clarification comments