Fix, documentations and etc...