Added more CGI stuff
Fix HTML output