roxygen and fixed methods issues