more cgi improvements