diff --git a/doc/cml.txt b/doc/cml.txt
index f1de3dcb..d0f9b694 100644
--- a/doc/cml.txt
+++ b/doc/cml.txt
@@ -147,7 +147,7 @@ Now we get about 10000 req/s instead of 600 req/s.
 Options
 =======
 
-:cache.extension: 
+:cml.extension: 
   the file extension that is bound to the cml-module
 
 Language
diff --git a/src/mod_cml.c b/src/mod_cml.c
index d8e63c31..0cdd9af2 100644
--- a/src/mod_cml.c
+++ b/src/mod_cml.c
@@ -23,7 +23,13 @@ INIT_FUNC(mod_cml_init) {
 	
 	p = calloc(1, sizeof(*p));
 	
-	p->basedir = buffer_init();
+	p->basedir         = buffer_init();
+	p->session_id      = buffer_init();
+	p->trigger_handler = buffer_init();
+	
+	p->eval            = buffer_array_init();
+	p->trigger_if      = buffer_array_init();
+	p->output_include  = buffer_array_init();
 	
 	return p;
 }
@@ -48,6 +54,12 @@ FREE_FUNC(mod_cml_free) {
 		free(p->config_storage);
 	}
 	
+	buffer_array_free(p->eval);
+	buffer_array_free(p->trigger_if);
+	buffer_array_free(p->output_include);
+	
+	buffer_free(p->trigger_handler);
+	buffer_free(p->session_id);
 	buffer_free(p->basedir);
 	
 	free(p);
@@ -62,7 +74,7 @@ SETDEFAULTS_FUNC(mod_cml_set_defaults) {
 	size_t i = 0;
 	
 	config_values_t cv[] = { 
-		{ "cache.extension",            NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },       /* 0 */
+		{ "cml.extension",            NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },       /* 0 */
 		{ NULL,                         NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
 	};
 	
@@ -108,7 +120,7 @@ static int mod_cml_patch_connection(server *srv, connection *con, plugin_data *p
 		for (j = 0; j < dc->value->used; j++) {
 			data_unset *du = dc->value->data[j];
 			
-			if (buffer_is_equal_string(du->key, CONST_STR_LEN("cache.extension"))) {
+			if (buffer_is_equal_string(du->key, CONST_STR_LEN("cml.extension"))) {
 				PATCH(ext);
 			}
 		}
@@ -269,6 +281,14 @@ URIHANDLER_FUNC(mod_cml_is_handled) {
 		mod_cml_patch_connection(srv, con, p, CONST_BUF_LEN(patch));
 	}
 	
+	buffer_array_reset(p->output_include);
+	buffer_array_reset(p->eval);
+	buffer_array_reset(p->trigger_if);
+	
+	buffer_reset(p->basedir);
+	buffer_reset(p->session_id);
+	buffer_reset(p->trigger_handler);
+	
 	if (buffer_is_empty(p->conf.ext)) return HANDLER_GO_ON;
 	
 	ct_len = p->conf.ext->used - 1;
diff --git a/src/mod_cml_logic.c b/src/mod_cml_logic.c
index 57dbd4c0..dd01694a 100644
--- a/src/mod_cml_logic.c
+++ b/src/mod_cml_logic.c
@@ -643,7 +643,7 @@ int cache_parse(server *srv, connection *con, plugin_data *p, buffer *fn) {
 			break;
 		case 19:
 			if (0 == strncmp(srv->tmp_buf->ptr, "output.content-type", key_len)) {
-				response_header_insert(srv, con, CONST_STR_LEN("Content-Type"), value, strlen(value));
+				response_header_overwrite(srv, con, CONST_STR_LEN("Content-Type"), value, strlen(value));
 			} else {
 				log_error_write(srv, __FILE__, __LINE__, "db", key_len, srv->tmp_buf);
 			}