some clean-up
add remaining chapters
roxygen updates