Correct typos.
Remove commented out side that is now located elsewhere.
Fix missing "+5" in R value length check.
Add test case for R value length check.