fixed broken references, re-write C-D MP section