some tweaks and document update