Dirty bug fixing
Correcting some merge bugs and removed duplicates from cgi_list
Updated output formatting