Fix stuff, mainly CGI