cran fixes
structural tweak