Major improvements on the whole doc