Make R CMD check happy, standardize spelling etc