Better doc and some improvements