Correct and improve documentation