Description / Some fixes