diff --git a/veejay-current/veejay-server/libplugger/livido-loader.c b/veejay-current/veejay-server/libplugger/livido-loader.c
index 0b3cd921..aa8790e4 100644
--- a/veejay-current/veejay-server/libplugger/livido-loader.c
+++ b/veejay-current/veejay-server/libplugger/livido-loader.c
@@ -489,7 +489,7 @@ static	int	init_parameter_port(livido_port_t *ptr, livido_port_t *in_param )
 //			pctrl = livido_plug_parameter_set_number; break;
 //		case HOST_PARAM_SWITCH:
 //			pctrl = livido_plug_parameter_set_bool; break;
-//@ FIXME: these are not yet supported
+//@ TODO: these are not yet supported
 //		case HOST_PARAM_COORD:
 //			pctrl = livido_plug_parameter_set_coord; break;
 //		case HOST_PARAM_COLOR:
@@ -677,7 +677,7 @@ void	livido_plug_free_namespace( void *fx_instance , void *data )
 {
 	void *osc_namespace = NULL;
 	int error = vevo_property_get( fx_instance, "HOST_osc",0,&osc_namespace);
-//@FIXME
+//@TODO OMC
 //	if( error == VEVO_NO_ERROR)
 //		veejay_osc_del_methods( data,osc_namespace,fx_instance, fx_instance );
 }
@@ -751,7 +751,7 @@ int	livido_plug_build_namespace( void *plugin_template , int entry_id, void *fx_
 				i,
 			       	param_templ	);
 		*/
-		//@ FIXME: OMC
+		//@ TODO: OMC
 		free(param_name);
 		free(format);
 		free(descrip);
@@ -1156,7 +1156,7 @@ int	livido_read_plug_configuration(void *filter_template, const char *name)
 	if(!f) { // lets write the plugin's default parameter values to disk
 		int n_params = vevo_property_num_elements( filter_template, "in_parameter_templates" );
 		if( n_params <= 0 ) {
-			return 0; // no defaults to write (for now). vevo serialization not yet complete for full dump FIXME
+			return 0; // no defaults to write (for now). vevo serialization not yet complete for full dump TODO
 		}
 
 		veejay_msg(VEEJAY_MSG_DEBUG, "No configuration file for livido plugin %s", name);
diff --git a/veejay-current/veejay-server/libplugger/plugload.c b/veejay-current/veejay-server/libplugger/plugload.c
index 39d44ac2..00c83a08 100644
--- a/veejay-current/veejay-server/libplugger/plugload.c
+++ b/veejay-current/veejay-server/libplugger/plugload.c
@@ -885,7 +885,7 @@ void plug_concatenate_all(void *osc, void *msg)
 		}
 	}
 */
-	//@ FIXME OMC
+	//@ TODO OMC
 }
 
 char	*plug_get_name( int fx_id )
diff --git a/veejay-current/veejay-server/libplugger/utility.c b/veejay-current/veejay-server/libplugger/utility.c
index e950887f..6759127e 100644
--- a/veejay-current/veejay-server/libplugger/utility.c
+++ b/veejay-current/veejay-server/libplugger/utility.c
@@ -140,7 +140,7 @@ void clone_prop_vevo( void *port, void *to_port, const char *key, const char *as
 			{
 				error = vevo_property_get( port, key, i, &(dtemp[i]));
 			}
-		//@ FIXME: scale parameter and treat as TYPE_INT
+		//@ TODO: scale parameter and treat as TYPE_INT
 
 			for( i = 0; i < num; i ++ ) {
 				itmp[i] = (int)( dtemp[i] * 100.0);
@@ -150,7 +150,7 @@ void clone_prop_vevo( void *port, void *to_port, const char *key, const char *as
 		//		error = vevo_property_set( to_port, as_key, type, num, &dtemp );
 		//	veejay_msg(0, "\t\tValue is %g ", dtemp[0] );
 			break;
-		//@ FIXME: not supported yet
+		//@ TODO: not supported yet
 	/*	case VEVO_ATOM_TYPE_STRING:
 			for( i = 0; i < num; i ++)
 			{
diff --git a/veejay-current/veejay-server/libstream/vj-tag.c b/veejay-current/veejay-server/libstream/vj-tag.c
index 470d7e09..b23d2160 100644
--- a/veejay-current/veejay-server/libstream/vj-tag.c
+++ b/veejay-current/veejay-server/libstream/vj-tag.c
@@ -927,7 +927,7 @@ int vj_tag_new(int type, char *filename, int stream_nr, editlist * el,
     switch (type) {
 	    case VJ_TAG_TYPE_V4L:
 		sprintf(tag->source_name, "%s", filename );
-//FIXME
+		
 		veejay_msg(VEEJAY_MSG_DEBUG, "V4l: %s",filename);
 
 /*
@@ -1023,7 +1023,7 @@ int _vj_tag_new_unicap( vj_tag * tag, int stream_nr, int width, int height, int
 
 		int foo_arg  = vj_shm_get_id();
 
-		if( extra != 0 ) //@ vj_shm_set_id is a hack FIXME
+		if( extra != 0 ) //@ vj_shm_set_id is a hack 
 			vj_shm_set_id( extra );
 
 		tag->generator = plug_activate(channel);
@@ -3064,7 +3064,7 @@ static	void	whiteframe_new(uint8_t *buf, int w, int h, int uv_len, uint8_t *Y, u
 			mean_of_v += tag->lfv[i];
 		}
 	} else {
-		for(i = 0; i < (w*h); i ++ ) { //@FIXME subtract dark current
+		for(i = 0; i < (w*h); i ++ ) { //@TODO subtract dark current
 			p = Y[i] - bf[i];
 			if( p < 0 ) p = 0;
 			tag->lf[i] = 0.0f + (double)p;
@@ -3128,7 +3128,7 @@ static void	whiteframe_process( uint8_t *Y, uint8_t *U, uint8_t *V, int w, int h
 
 	} else {
 		int p;
-		//@ should subtract dark current, FIXME
+		//@ should subtract dark current, TODO
 		for( i = 0; i < (w*h); i ++ ) {
 			p = Y[i] - bf[i];
 			if( p < 0 )
diff --git a/veejay-current/veejay-server/libvevo/vevo.c b/veejay-current/veejay-server/libvevo/vevo.c
index 6bbff514..f65b8ca6 100644
--- a/veejay-current/veejay-server/libvevo/vevo.c
+++ b/veejay-current/veejay-server/libvevo/vevo.c
@@ -607,7 +607,8 @@ static atom_t *vevo_new_atom(__vevo_port_t * port, int atom_type,
 
     if(atom_type == VEVO_ATOM_TYPE_STRING || atom_type == VEVO_ATOM_TYPE_UTF8STRING )
 	{
-   		atom->value = (atom_size > 0 ?(void*)vj_malloc(atom_size):NULL);//@ FIXME: strings do not come from pool	
+   		atom->value = (atom_size > 0 ?(void*)vj_malloc(atom_size):NULL);
+		//@ TODO: strings do not come from pool	
 	}else
     {	 if(atom_type == VEVO_ATOM_TYPE_DOUBLE ) {
 		 atom->value = (atom_size > 0 ? (void*) vevo_pool_alloc_dbl(double,port->pool ): NULL);
@@ -1721,7 +1722,6 @@ void	vevo_port_recursive_free( vevo_port_t *port )
 	port = NULL;
 }	
 	
-//@ FIXME: method to recursivly iterate a port and all subports to size-up all data, vevo_port_get_total_size()
 
 //! Flatten all ports and return list of ports to be destroyed
 /*!
diff --git a/veejay-current/veejay-server/libvje/effects/balls.c b/veejay-current/veejay-server/libvje/effects/balls.c
index 96c92f67..e4dc81a1 100644
--- a/veejay-current/veejay-server/libvje/effects/balls.c
+++ b/veejay-current/veejay-server/libvje/effects/balls.c
@@ -155,7 +155,7 @@ static void	blob_init_( blob_t *b , int blob_id, int w , int h)
 	b->vx = 0.01;
 	b->vy = 0.01;
 }
-// FIXME private 
+
 int	boids_malloc(int w, int h)
 {
 	int j,i;
diff --git a/veejay-current/veejay-server/libvje/effects/blob.c b/veejay-current/veejay-server/libvje/effects/blob.c
index 3116ef12..84079633 100644
--- a/veejay-current/veejay-server/libvje/effects/blob.c
+++ b/veejay-current/veejay-server/libvje/effects/blob.c
@@ -108,7 +108,7 @@ static void	blob_init_( blob_t *b , int w , int h)
 	b->x = (w >> 1) - blob_radius_;
 	b->y = (h >> 1) - blob_radius_;
 }
-// FIXME private 
+
 int	blob_malloc(int w, int h)
 {
 	int j,i;
diff --git a/veejay-current/veejay-server/libvje/effects/boids.c b/veejay-current/veejay-server/libvje/effects/boids.c
index 120f4f33..0de9e94b 100644
--- a/veejay-current/veejay-server/libvje/effects/boids.c
+++ b/veejay-current/veejay-server/libvje/effects/boids.c
@@ -156,7 +156,7 @@ static void	blob_init_( blob_t *b , int blob_id, int w , int h)
 	b->vx = 0.01;
 	b->vy = 0.01;
 }
-// FIXME private 
+
 int	boids_malloc(int w, int h)
 {
 	int j,i;
diff --git a/veejay-current/veejay-server/libvje/effects/dices.c b/veejay-current/veejay-server/libvje/effects/dices.c
index 993c5cc0..f554c739 100644
--- a/veejay-current/veejay-server/libvje/effects/dices.c
+++ b/veejay-current/veejay-server/libvje/effects/dices.c
@@ -66,7 +66,7 @@ vj_effect *dices_init(int width, int height)
 	ve->param_description = vje_build_param_list( ve->num_params, "Dice size" );
     return ve;
 }
-// FIXME: private
+
 int	dices_malloc(int width, int height)
 {
 	g_dicemap = (uint8_t *) vj_malloc(sizeof(uint8_t) * width * height);
diff --git a/veejay-current/veejay-server/libvje/effects/distort.c b/veejay-current/veejay-server/libvje/effects/distort.c
index 5864c67b..7f5359a7 100644
--- a/veejay-current/veejay-server/libvje/effects/distort.c
+++ b/veejay-current/veejay-server/libvje/effects/distort.c
@@ -59,7 +59,6 @@ vj_effect *distortion_init(int width, int height)
 	ve->param_description = vje_build_param_list( ve->num_params, "Inc 1" , "Inc2" );
     return ve;
 }
-// FIXME private
 
 void distortion_free() {
    if(plasma_table) free(plasma_table);
diff --git a/veejay-current/veejay-server/libvje/effects/gamma.c b/veejay-current/veejay-server/libvje/effects/gamma.c
index f2c97fbf..1edc34e6 100644
--- a/veejay-current/veejay-server/libvje/effects/gamma.c
+++ b/veejay-current/veejay-server/libvje/effects/gamma.c
@@ -44,7 +44,6 @@ vj_effect *gamma_init(int w, int h)
     ve->parallel = 1;
 	return ve;
 }
-// FIXME private
 
 inline void gamma_setup(int width, int height,
 			double gamma_value)
diff --git a/veejay-current/veejay-server/libvje/effects/lumamask.c b/veejay-current/veejay-server/libvje/effects/lumamask.c
index a48a2d9c..d3e77e4a 100644
--- a/veejay-current/veejay-server/libvje/effects/lumamask.c
+++ b/veejay-current/veejay-server/libvje/effects/lumamask.c
@@ -60,12 +60,9 @@ vj_effect *lumamask_init(int width, int height)
     return ve;
 }
 
-// FIXME: private
-
 static int n__ = 0;
 static int N__ = 0;
 
-
 int lumamask_malloc(int width, int height)
 {
    buf[0] = (uint8_t*)vj_malloc( sizeof(uint8_t) * width * height * 3);
diff --git a/veejay-current/veejay-server/libvje/effects/magicmirror.c b/veejay-current/veejay-server/libvje/effects/magicmirror.c
index 1d1f4847..baae7532 100644
--- a/veejay-current/veejay-server/libvje/effects/magicmirror.c
+++ b/veejay-current/veejay-server/libvje/effects/magicmirror.c
@@ -61,8 +61,6 @@ vj_effect *magicmirror_init(int w, int h)
 	ve->param_description = vje_build_param_list(ve->num_params, "X", "Y", "X","Y" );
     return ve;
 }
-// FIXME private
-
 static int n__ = 0;
 static int N__ = 0;
 int magicmirror_malloc(int w, int h)
diff --git a/veejay-current/veejay-server/libvje/effects/mtracer.c b/veejay-current/veejay-server/libvje/effects/mtracer.c
index 89c3dba7..f13a3a13 100644
--- a/veejay-current/veejay-server/libvje/effects/mtracer.c
+++ b/veejay-current/veejay-server/libvje/effects/mtracer.c
@@ -49,7 +49,6 @@ vj_effect *mtracer_init(int w, int h)
 	ve->param_description = vje_build_param_list( ve->num_params, "Mode", "Length");
     return ve;
 }
-// FIXME private
 void mtracer_free() {
 	int i;
 	for(i = 0; i < 3; i ++ ) {
diff --git a/veejay-current/veejay-server/libvje/effects/noiseadd.c b/veejay-current/veejay-server/libvje/effects/noiseadd.c
index d47640ea..01af7014 100644
--- a/veejay-current/veejay-server/libvje/effects/noiseadd.c
+++ b/veejay-current/veejay-server/libvje/effects/noiseadd.c
@@ -47,7 +47,6 @@ vj_effect *noiseadd_init(int width , int height)
 	ve->param_description = vje_build_param_list( ve->num_params, "Mode", "Amplification");
     return ve;
 }
-// FIXME private
 
 int noiseadd_malloc(int width, int height)
 {
diff --git a/veejay-current/veejay-server/libvje/effects/radialblur.c b/veejay-current/veejay-server/libvje/effects/radialblur.c
index 149800ae..c5761e6f 100644
--- a/veejay-current/veejay-server/libvje/effects/radialblur.c
+++ b/veejay-current/veejay-server/libvje/effects/radialblur.c
@@ -46,7 +46,7 @@
 #include <libvjmem/vjmem.h>
 #include "radialblur.h"
 #include "common.h"
-//FIXME: private
+
 static uint8_t *radial_src[4] = { NULL,NULL,NULL,NULL};
 
 vj_effect *radialblur_init(int w,int h)
diff --git a/veejay-current/veejay-server/libvje/effects/reflection.c b/veejay-current/veejay-server/libvje/effects/reflection.c
index 9d2dca35..a728ffc7 100644
--- a/veejay-current/veejay-server/libvje/effects/reflection.c
+++ b/veejay-current/veejay-server/libvje/effects/reflection.c
@@ -77,7 +77,7 @@ vj_effect *reflection_init(int width,int height)
 	ve->param_description = vje_build_param_list( ve->num_params, "Value 1", "Value 2", "Mode");
     return ve;
 }
-// FIXME private
+
 int reflection_malloc(int width, int height)
 { 
   int i, x, y;
diff --git a/veejay-current/veejay-server/libvje/effects/ripple.c b/veejay-current/veejay-server/libvje/effects/ripple.c
index 8b73851e..430ff8ff 100644
--- a/veejay-current/veejay-server/libvje/effects/ripple.c
+++ b/veejay-current/veejay-server/libvje/effects/ripple.c
@@ -39,7 +39,7 @@
 #define RIPPLE_DEGREES 360
 #define RIPPLE_VAL 180.0
 
-static double *ripple_table;
+static double *ripple_table = NULL;
 static uint8_t *ripple_data[4] = { NULL,NULL,NULL,NULL };
 static double *ripple_sin;
 static double *ripple_cos;
@@ -49,7 +49,6 @@ static int ripple_ampli = 0;
 static int ripple_attn = 0;
 static int have_calc_data = 0;
 
-// FIXME private
 vj_effect *ripple_init(int width, int height)
 {
     vj_effect *ve = (vj_effect *) vj_calloc(sizeof(vj_effect));
diff --git a/veejay-current/veejay-server/libvje/effects/rotozoom.c b/veejay-current/veejay-server/libvje/effects/rotozoom.c
index 61b46804..1b993d7c 100644
--- a/veejay-current/veejay-server/libvje/effects/rotozoom.c
+++ b/veejay-current/veejay-server/libvje/effects/rotozoom.c
@@ -33,7 +33,7 @@ static int new_path = 0;
 static int roto_old_p = 0;
 static int roto_old_z = 0;
 static uint8_t *rotobuffer[4] = { NULL,NULL,NULL,NULL };
-// FIXME private
+
 vj_effect *rotozoom_init(int width, int height)
 {
     int i, j;
diff --git a/veejay-current/veejay-server/libvje/effects/scratcher.c b/veejay-current/veejay-server/libvje/effects/scratcher.c
index f2455160..c43097b3 100644
--- a/veejay-current/veejay-server/libvje/effects/scratcher.c
+++ b/veejay-current/veejay-server/libvje/effects/scratcher.c
@@ -56,8 +56,6 @@ vj_effect *scratcher_init(int w, int h)
 
 }
 
-//FIXME private
-
 void scratcher_free() {
    if(frame[0])
 	  free(frame[0]);
diff --git a/veejay-current/veejay-server/libvje/effects/sinoids.c b/veejay-current/veejay-server/libvje/effects/sinoids.c
index 19447ad3..0b70d5b9 100644
--- a/veejay-current/veejay-server/libvje/effects/sinoids.c
+++ b/veejay-current/veejay-server/libvje/effects/sinoids.c
@@ -52,7 +52,7 @@ vj_effect *sinoids_init(int width, int height)
 }
 static int n__ = 0;
 static int N__= 0;
-//FIXME private
+
 int sinoids_malloc(int width, int height)
 {
 	int i = 0;
diff --git a/veejay-current/veejay-server/libvje/effects/slice.c b/veejay-current/veejay-server/libvje/effects/slice.c
index d7848af6..f0b3215e 100644
--- a/veejay-current/veejay-server/libvje/effects/slice.c
+++ b/veejay-current/veejay-server/libvje/effects/slice.c
@@ -52,7 +52,6 @@ vj_effect *slice_init(int width,int height)
 	ve->param_description = vje_build_param_list( ve->num_params, "Slices", "Mode");
     return ve;
 }
-//FIXME private
 
 int 	slice_malloc(int width, int height)
 {
diff --git a/veejay-current/veejay-server/libvje/effects/swirl.c b/veejay-current/veejay-server/libvje/effects/swirl.c
index 2ee06bb7..745a7e99 100644
--- a/veejay-current/veejay-server/libvje/effects/swirl.c
+++ b/veejay-current/veejay-server/libvje/effects/swirl.c
@@ -44,10 +44,10 @@ vj_effect *swirl_init(int w, int h)
 	ve->param_description = vje_build_param_list( ve->num_params, "Degrees" );
     return ve;
 }
-// FIXME private
-static double *polar_map;
-static double *fish_angle;
-static int *cached_coords;
+
+static double *polar_map = NULL;
+static double *fish_angle = NULL;
+static int *cached_coords = NULL;
 static uint8_t *buf[4] = { NULL,NULL,NULL,NULL };
 
 
@@ -99,6 +99,11 @@ void	swirl_free()
 		free(polar_map);
 	if(fish_angle)
 		free(fish_angle);
+	if(cached_coords)
+		free(cached_coords);
+	polar_map = NULL;
+	fish_angle = NULL;
+	cached_coords = NULL;
 }
 
 
diff --git a/veejay-current/veejay-server/libvje/effects/uvcorrect.c b/veejay-current/veejay-server/libvje/effects/uvcorrect.c
index dfb4aab1..e44b515a 100644
--- a/veejay-current/veejay-server/libvje/effects/uvcorrect.c
+++ b/veejay-current/veejay-server/libvje/effects/uvcorrect.c
@@ -44,7 +44,7 @@
 #include "common.h"
 #include <math.h>
 
-static uint8_t *chrominance;
+static uint8_t *chrominance = NULL;
 
 vj_effect *uvcorrect_init(int w, int h)
 {
@@ -86,8 +86,6 @@ vj_effect *uvcorrect_init(int w, int h)
     ve->extra_frame = 0;
     ve->has_help = 1;
 	ve->has_user = 0;
-// FIXME: private
-    //chrominance = (uint8_t*) vj_calloc (sizeof(uint8_t) * 512 * 256 );
     
     return ve;
 }
diff --git a/veejay-current/veejay-server/libvje/transitions/3bar.c b/veejay-current/veejay-server/libvje/transitions/3bar.c
index dd6a492e..ce122fe4 100644
--- a/veejay-current/veejay-server/libvje/transitions/3bar.c
+++ b/veejay-current/veejay-server/libvje/transitions/3bar.c
@@ -65,7 +65,7 @@ static int bar_bot_auto = 0;
 static int bar_top_vert = 0;
 
 static int bar_bot_vert = 0;
-// FIXME private
+
 void bar_apply(VJFrame *frame, VJFrame *frame2, int width, int height,int divider, int top_y, int bot_y, int top_x, int bot_x  ) {
 
 	int top_width = width;		   /* frame in frame destination area */
diff --git a/veejay-current/veejay-server/libvje/transitions/wipe.c b/veejay-current/veejay-server/libvje/transitions/wipe.c
index 509ea237..60b7cede 100644
--- a/veejay-current/veejay-server/libvje/transitions/wipe.c
+++ b/veejay-current/veejay-server/libvje/transitions/wipe.c
@@ -45,8 +45,6 @@ vj_effect *wipe_init(int w,int h)
     return ve;
 
 }
-// FIXME private
-
 static int g_wipe_width = 0;
 static int g_wipe_height = 0;
 void wipe_apply( VJFrame *frame, VJFrame *frame2,
diff --git a/veejay-current/veejay-server/libvjnet/vj-server.c b/veejay-current/veejay-server/libvjnet/vj-server.c
index 329d971b..f8e74d91 100644
--- a/veejay-current/veejay-server/libvjnet/vj-server.c
+++ b/veejay-current/veejay-server/libvjnet/vj-server.c
@@ -416,7 +416,6 @@ int vj_server_send( vj_server *vje, int link_id, uint8_t *buf, int len )
 
 	if( !vje->use_mcast)
 	{
-		//@ FIXME: vje->send_size is not used in sock_t_send_fd
 		total  = sock_t_send_fd( Link[link_id]->handle, vje->send_size, buf, len);
 		if( vje->logfd ) {
 			fprintf(vje->logfd, "sent %d of %d bytes to handle %d (link %d) %s\n", total,len, Link[link_id]->handle,link_id,(char*)(inet_ntoa(vje->remote.sin_addr)) );
diff --git a/veejay-current/veejay-server/libyuv/yuvconv.c b/veejay-current/veejay-server/libyuv/yuvconv.c
index baf26ace..a074723f 100644
--- a/veejay-current/veejay-server/libyuv/yuvconv.c
+++ b/veejay-current/veejay-server/libyuv/yuvconv.c
@@ -208,8 +208,8 @@ int get_chroma_from_pixfmt(int pixfmt) {
 		case PIX_FMT_YUV420P: chroma = Y4M_CHROMA_420MPEG2; break;
 		case PIX_FMT_YUV422P: chroma = Y4M_CHROMA_422; break;
 		case PIX_FMT_YUV444P: chroma = Y4M_CHROMA_444; break;
-		case PIX_FMT_YUVJ422P: chroma = Y4M_CHROMA_422; break; //FIXME
-		case PIX_FMT_YUVJ444P: chroma = Y4M_CHROMA_444; break; //FIXME
+		case PIX_FMT_YUVJ422P: chroma = Y4M_CHROMA_422; break; 
+		case PIX_FMT_YUVJ444P: chroma = Y4M_CHROMA_444; break;
 		case PIX_FMT_YUV411P: chroma = Y4M_CHROMA_411; break;
 		case PIX_FMT_GRAY8: chroma = PIX_FMT_GRAY8; break;
 		default:
diff --git a/veejay-current/veejay-server/veejay/veejay.c b/veejay-current/veejay-server/veejay/veejay.c
index 0903da3f..f43ccc96 100644
--- a/veejay-current/veejay-server/veejay/veejay.c
+++ b/veejay-current/veejay-server/veejay/veejay.c
@@ -669,7 +669,7 @@ static void print_license()
 
 static void donothing(int sig)
 {
-	vj_lock(info); //FIXME
+	vj_lock(info);
 	veejay_handle_signal( info, sig );	
 	vj_unlock(info);
 }
diff --git a/veejay-current/veejay-server/veejay/vj-event.c b/veejay-current/veejay-server/veejay/vj-event.c
index 07a042d9..2a4746c2 100644
--- a/veejay-current/veejay-server/veejay/vj-event.c
+++ b/veejay-current/veejay-server/veejay/vj-event.c
@@ -424,7 +424,7 @@ else { veejay_msg(VEEJAY_MSG_DEBUG,"arg has size of 0x0");}
 
 
 #define CLAMPVAL(a) { if(a<0)a=0; else if(a >255) a =255; }
-//@ FIXME: implement embedded help
+//@ TODO: implement embedded help
 //@ F1 -> sample playing FX=off -> standard help
 //@ F1 -> sample playing FX=on entry >= 0 <= MAX_E : show help for FX on entry N
 //
@@ -7125,34 +7125,6 @@ void	vj_event_vp_stack( void *ptr, const char format[], va_list ap )
 	} 
 
 }
-void	vj_event_vp_get_points( void *ptr, const char format[], va_list ap )
-{
-	veejay_t *v = (veejay_t*) ptr;
-	int args[2];
-	char *str = NULL;
-	P_A(args,str,format,ap);
-
-	char msg[280];
-	char message[256];
-	
-	if( args[0] == 0 || !v->composite) {
-		snprintf(message,256,"%d %d %d %d %d %d %d %d",
-			0,0,0,0,0,0,0,0);
-		FORMAT_MSG(msg,message);
-		SEND_MSG(v,msg);
-		return;
-	}	
-//FIXME
-//	int *r = viewport_event_get_projection(  composite_get_vp( v->composite ),args[0] );
-	int r[8];
-	memset(r,0,sizeof(r));	
-	snprintf(message,256, "%d %d %d %d %d %d %d %d",
-		r[0],r[1],r[2],r[3],r[4],r[5],r[6],r[7] );
-
-	char *err = "0 0 0 0 0 0 0 0";
-	FORMAT_MSG(msg,err);
-	SEND_MSG(v,err);
-}
 
 void	vj_event_vp_set_points( void *ptr, const char format[], va_list ap )
 {
@@ -8617,11 +8589,13 @@ void	vj_event_get_cali_image		(	void *ptr,	const char format[],	va_list	ap	)
 		SEND_MSG(v, "00000000"  );
 	}
 	else {
-		char header[128];//FIXME
-		sprintf( header, "%03d%08d%06d%06d%06d%06d",8+6+6+6+6,len, len, 0, v->video_output_width, v->video_output_height );
+		char header[64];
+		snprintf( header,sizeof(header), "%03d%08d%06d%06d%06d%06d",8+6+6+6+6,len, len, 0, v->video_output_width, v->video_output_height );
 		SEND_MSG( v, header );
-
 		int res = vj_server_send(v->vjs[VEEJAY_PORT_CMD], v->uc->current_link, buf,len);
+		if(!res) {
+			veejay_msg(0,"Failed to get calibration image");
+		}
 	}
 }
 
diff --git a/veejay-current/veejay-server/veejay/vj-eventman.c b/veejay-current/veejay-server/veejay/vj-eventman.c
index 476c0ccc..c13d0f90 100644
--- a/veejay-current/veejay-server/veejay/vj-eventman.c
+++ b/veejay-current/veejay-server/veejay/vj-eventman.c
@@ -2506,17 +2506,6 @@ void		vj_init_vevo_events(void)
 				0,
 				NULL );
 
-	index_map_[ VIMS_PROJ_GET_POINT ]			=	_new_event(
-				"%d",
-				VIMS_PROJ_GET_POINT,
-				"Get viewport points using scale",
-				vj_event_vp_get_points,
-				1,
-				VIMS_ALLOW_ANY,
-				"Grid size",
-				1000,
-				NULL );
-
 	index_map_[ VIMS_FRONTBACK ]				=	_new_event(
 				NULL,
 				VIMS_FRONTBACK,
diff --git a/veejay-current/veejay-server/veejay/vj-perform.c b/veejay-current/veejay-server/veejay/vj-perform.c
index 347fa157..33845aff 100644
--- a/veejay-current/veejay-server/veejay/vj-perform.c
+++ b/veejay-current/veejay-server/veejay/vj-perform.c
@@ -73,7 +73,7 @@ typedef struct {
     uint8_t *P1;
     int	     ssm;
     char     padding[12];
-} ycbcr_frame; //@ FIXME: drop this structure and replace for veejay-next 's VJFrame
+} ycbcr_frame; //@ TODO: drop this structure and replace for veejay-next 's VJFrame
 
 typedef struct {
 	int	fader_active;
@@ -241,7 +241,7 @@ static int vj_perform_sample_is_cached(veejay_t *info,int sample_id, int chain_e
 	int c;
 	int res = -1;
 
-	if( sample_id == cached_sample_frames[0] ) //FIXME 
+	if( sample_id == cached_sample_frames[0] )  
 		return 0;
 
 	for(c=1; c < CACHE_SIZE ; c++)
@@ -1958,8 +1958,8 @@ static void vj_perform_apply_secundary(veejay_t * info, int sample_id, int type,
 			break;
     }
 }
-//@ FIXME: Render all image effects in subchain
-//
+
+//@ TODO: Render all image effects in subchain
 static void	vj_perform_tag_render_chain_entry(veejay_t *info, int chain_entry)
 {
 	VJFrame *frames[2];
diff --git a/veejay-current/veejay-server/veejay/vj-sdl.c b/veejay-current/veejay-server/veejay/vj-sdl.c
index 341a789b..c45f41ac 100644
--- a/veejay-current/veejay-server/veejay/vj-sdl.c
+++ b/veejay-current/veejay-server/veejay/vj-sdl.c
@@ -124,7 +124,6 @@ vj_sdl *vj_sdl_allocate(int width, int height, int fmt, int use_key, int use_mou
     vjsdl->display = NULL;
 	switch(fmt) {
 	 //@ dont use YUVJ here - on blitting it to SDL it will be converted to YUV clamped for YUYJ422
-	//FIXME	
 	case FMT_422F:vjsdl->ffmpeg_pixfmt = PIX_FMT_YUV422P;break;
 	case FMT_422:vjsdl->ffmpeg_pixfmt = PIX_FMT_YUV422P;break;
 	}