liamrevell some other changes to get on CRAN