Major round of debugging (R CMD check)