diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c
index 6eba322..af02c56 100644
--- a/libeplayer3/container/container_ffmpeg.c
+++ b/libeplayer3/container/container_ffmpeg.c
@@ -106,7 +106,7 @@ static AVFormatContext*   avContext = NULL;
 
 static unsigned char isContainerRunning = 0;
 
-long long int latestPts = 0;
+static long long int latestPts = 0;
 
 static int restart_audio_resampling = 0;
 static off_t seek_target_bytes = 0;
diff --git a/libeplayer3/output/writer/framebuffer.c b/libeplayer3/output/writer/framebuffer.c
index 6ffff24..738fb6e 100644
--- a/libeplayer3/output/writer/framebuffer.c
+++ b/libeplayer3/output/writer/framebuffer.c
@@ -119,20 +119,19 @@ static int writeData(void* _call)
 		return 0;
 	}
 
+	int dst_stride = call->destStride/sizeof(uint32_t);
+	int dst_delta = dst_stride - call->Width;
+	uint32_t *dst = call->destination + call->y * dst_stride + call->x;
+
 	if (call->data)
 	{
-		int src_stride = call->Stride;
-		unsigned int x,y;
-		const unsigned char *src = call->data;
-		int dst_stride = call->destStride/sizeof(uint32_t);
-		int dst_delta = dst_stride - call->Width;
-		uint32_t *dst = call->destination + call->y * dst_stride + call->x;
-		static uint32_t last_color = 0;
-		static uint32_t colortable[256];
+		int src_delta = call->Stride - call->Width;
+		unsigned char *src = call->data;
+		static uint32_t last_color = 0, colortable[256];
+
 		if (last_color != call->color) {
 			// call->color is rgba, our spark frame buffer is argb
-			uint32_t c = call->color >> 8;
-			uint32_t a = 255 - (call->color & 0xff);
+			uint32_t c = call->color >> 8, a = 255 - (call->color & 0xff);
 			int i;
 			for (i = 0; i < 256; i++) {
 				uint32_t k = (a * i) >> 8;
@@ -151,25 +150,21 @@ static int writeData(void* _call)
 		fb_printf(100, "dest		%p\n", call->destination);
 		fb_printf(100, "dest.stride	%d\n", call->destStride);
 
-		for (y=0;y<call->Height;y++) {
-			for (x = 0; x < call->Width; x++) {
-				uint32_t c = colortable[src[x]];
+		unsigned char *src_final = src + call->Height * call->Width;
+		for (; src < src_final; dst += dst_delta, src += src_delta) {
+			u_char *src_end = src + call->Width;
+			for (; src < src_end; dst++, src++) {
+				uint32_t c = colortable[*src];
 				if (c)
-					*dst++ = c;
-				else
-					dst++;
+					*dst = c;
 			}
-			dst += dst_delta;
-			src += src_stride;
 		}
 	} else {
-		unsigned int y;
-		int dst_stride = call->destStride/sizeof(uint32_t);
-		uint32_t *dst = call->destination + call->y * dst_stride + call->x;
-
-		for (y = 0; y < call->Height; y++) {
-			memset(dst, 0, call->Width * 4);
-			dst += dst_stride;
+		uint32_t *dst_final = dst + call->Width + call->Height * dst_stride;
+		for (; dst < dst_final; dst += dst_delta) {
+			uint32_t *dst_end = dst + call->Width;
+			for (; dst < dst_end; dst++)
+				*dst = 0;
 		}
 	}
 
diff --git a/libeplayer3/output/writer/h264.c b/libeplayer3/output/writer/h264.c
index f7f440f..6731111 100644
--- a/libeplayer3/output/writer/h264.c
+++ b/libeplayer3/output/writer/h264.c
@@ -93,7 +93,6 @@ typedef struct avcC_s
 /* ***************************** */
 const unsigned char Head[]                  = {0, 0, 0, 1};
 static int initialHeader = 1;
-//static int NoOtherBeginningFound = 1;
 static unsigned int        NalLengthBytes          = 1;
 
 /* ***************************** */
@@ -107,7 +106,6 @@ static unsigned int        NalLengthBytes          = 1;
 static int reset()
 {
     initialHeader = 1;
-    //NoOtherBeginningFound = 1;
     return 0;
 }
 
@@ -149,8 +147,6 @@ static int writeData(void* _call)
     }
 
     if((call->len > 3) && ((call->data[0] == 0x00 && call->data[1] == 0x00 && call->data[2] == 0x00 && call->data[3] == 0x01) ||
-// This seems to make playback unreliable. Disabled for now. --martii
-       //(call->data[0] == 0x00 && call->data[1] == 0x00 && call->data[2] == 0x01 && NoOtherBeginningFound) ||
             (call->data[0] == 0xff && call->data[1] == 0xff && call->data[2] == 0xff && call->data[3] == 0xff)))
     {
 	unsigned int PacketLength = 0;
@@ -173,7 +169,6 @@ static int writeData(void* _call)
         iov[0].iov_len = InsertPesHeader(PesHeader, PacketLength, MPEG_VIDEO_PES_START_CODE, call->Pts, FakeStartCode);
 	return writev(call->fd, iov, ic);
     }
-    //NoOtherBeginningFound = 0;
 
     if (initialHeader)
     {
diff --git a/libeplayer3/output/writer/pcm.c b/libeplayer3/output/writer/pcm.c
index f3dde4f..cc4a4c3 100644
--- a/libeplayer3/output/writer/pcm.c
+++ b/libeplayer3/output/writer/pcm.c
@@ -207,7 +207,7 @@ static int writeData(void* _call)
 	if (initialHeader) {
 		initialHeader = 0;
 		prepareClipPlay(pcmPrivateData->uNoOfChannels, pcmPrivateData->uSampleRate, 
-			pcmPrivateData->uBitsPerSample, pcmPrivateData->bLittleEndian);
+				pcmPrivateData->uBitsPerSample, pcmPrivateData->bLittleEndian);
 	}
 
 	unsigned char * buffer = call->data;
diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp
index 0bc68e4..fc3ab45 100644
--- a/libspark/playback_libeplayer3.cpp
+++ b/libspark/playback_libeplayer3.cpp
@@ -355,6 +355,11 @@ bool cPlayback::GetSpeed(int &speed) const
 	return true;
 }
 
+void cPlayback::GetPts(uint64_t &pts)
+{
+	player->playback->Command(player, PLAYBACK_PTS, (void*)pts);
+}
+
 // in milliseconds
 bool cPlayback::GetPosition(int &position, int &duration)
 {