Several fix + doc