fix bugs in doc and smooth out presentation
merge