last fixes, some ugly, some quite nice, but ready to be used !