diff --git a/README.md b/README.md
index d53d0e6..b5e26fe 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ streaming. While this feature can be enabled through rtmp_auto_push on|off direc
             application big {
                 live on;
 
-                # On every pusblished stream run this command (ffmpeg)
+                # On every published stream run this command (ffmpeg)
                 # with substitutions: $app/${app}, $name/${name} for application & stream name.
                 #
                 # This ffmpeg call receives stream from this application &
diff --git a/doc/getting_started.md b/doc/getting_started.md
index ff4a578..fe95a60 100644
--- a/doc/getting_started.md
+++ b/doc/getting_started.md
@@ -9,7 +9,7 @@ $ cd /usr/build
 
 Download & unpack latest nginx-rtmp (you can also use http)
 ```sh
-$ git clone git://github.com/arut/nginx-rtmp-module.git
+$ git clone git://github.com/sergey-dryabzhinsky/nginx-rtmp-module
 ```
 
 Download & unpack nginx (you can also use svn)
diff --git a/hls/ngx_rtmp_hls_module.c b/hls/ngx_rtmp_hls_module.c
index 3b9f5a8..2e1a8bf 100644
--- a/hls/ngx_rtmp_hls_module.c
+++ b/hls/ngx_rtmp_hls_module.c
@@ -985,12 +985,13 @@ ngx_rtmp_hls_get_fragment_datetime(ngx_rtmp_session_t *s, uint64_t ts)
         msec += (ts / 90);
         ngx_gmtime(msec / 1000, &tm);
 
-        datetime->data = (u_char *) ngx_pcalloc(s->connection->pool, ngx_cached_http_log_iso8601.len * sizeof(u_char));
-        (void) ngx_sprintf(datetime->data, "%4d-%02d-%02dT%02d:%02d:%02d-00:00",
+        datetime->len = sizeof("1970-01-01T00:00:00.000-00:00") - 1;
+        datetime->data = (u_char *) ngx_pcalloc(s->connection->pool, datetime->len * sizeof(u_char));
+        (void) ngx_sprintf(datetime->data, "%4d-%02d-%02dT%02d:%02d:%02d.%03d-00:00",
                            tm.ngx_tm_year, tm.ngx_tm_mon,
                            tm.ngx_tm_mday, tm.ngx_tm_hour,
-                           tm.ngx_tm_min, tm.ngx_tm_sec);
-        datetime->len = ngx_cached_http_log_iso8601.len;
+                           tm.ngx_tm_min, tm.ngx_tm_sec,
+                           msec % 1000);
         return datetime;
 
     case NGX_RTMP_HLS_DATETIME_SYSTEM:
diff --git a/ngx_rtmp_eval.c b/ngx_rtmp_eval.c
index 1e5195a..c658f14 100644
--- a/ngx_rtmp_eval.c
+++ b/ngx_rtmp_eval.c
@@ -166,6 +166,7 @@ ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e, ngx_str_t *out,
                         state = ESCAPE;
                         continue;
                 }
+                /* fall through */
 
             case ESCAPE:
                 ngx_rtmp_eval_append(&b, &c, 1, log);
diff --git a/ngx_rtmp_live_module.c b/ngx_rtmp_live_module.c
index 8380d94..73d67be 100644
--- a/ngx_rtmp_live_module.c
+++ b/ngx_rtmp_live_module.c
@@ -1227,7 +1227,7 @@ ngx_rtmp_live_on_fi(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
 
         { NGX_RTMP_AMF_STRING,
           ngx_null_string,
-          "onFi", 0 },
+          "onFI", 0 },
 
         { NGX_RTMP_AMF_MIXED_ARRAY,
           ngx_null_string,
@@ -1254,7 +1254,7 @@ ngx_rtmp_live_on_fi(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
     if (res == NGX_OK) {
 
         ngx_log_error(NGX_LOG_DEBUG, s->connection->log, 0,
-            "live: onFi: date='%s', time='%s'",
+            "live: onFI: date='%s', time='%s'",
             v.date, v.time);
 
         out_dt_elts[0].data = v.date;
@@ -1513,7 +1513,7 @@ ngx_rtmp_live_postconfiguration(ngx_conf_t *cf)
     ch->handler = ngx_rtmp_live_on_cue_point;
 
     ch = ngx_array_push(&cmcf->amf);
-    ngx_str_set(&ch->name, "onFi");
+    ngx_str_set(&ch->name, "onFI");
     ch->handler = ngx_rtmp_live_on_fi;
 
     ch = ngx_array_push(&cmcf->amf);
diff --git a/ngx_rtmp_send.c b/ngx_rtmp_send.c
index 69dfed9..316df69 100644
--- a/ngx_rtmp_send.c
+++ b/ngx_rtmp_send.c
@@ -895,7 +895,7 @@ ngx_rtmp_create_fi(ngx_rtmp_session_t *s)
 
         { NGX_RTMP_AMF_STRING,
           ngx_null_string,
-          "onFi", 0 },
+          "onFI", 0 },
 
         { NGX_RTMP_AMF_NUMBER,
           ngx_null_string,