Documentation update and case statement tweak