Minor bug fixes and documentation improvement
Documentation improvement