Change and improve documentation