update documentation; tried to fix startup bug.
merge