more CGI fix
better expanded initialization