Updated spec with CGI and other misc updates #655
+47
−78
Merged
8000