Add multi-column test. Clean up/comment R code. Implement simple header checks.