Fix, update and improve the documentation