Better doc + start prepare for packaging