Documentation update, and problems fixed