Improve & fix documentation