diff --git a/.Rbuildignore b/.Rbuildignore
index 763a36a..06772ba 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -1,11 +1,8 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
-^README\.Rmd$
-^README-.*\.png$
+^README.*$
 ^\.travis\.yml$
 ^CONDUCT\.md$
-^README_figs
-^README\.html$
 ^cran-comments\.md$
 ^revdep$
 ^appveyor\.yml$
diff --git a/DESCRIPTION b/DESCRIPTION
index 132b3a7..83ee34e 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -56,7 +56,7 @@ Imports:
     extrafont,
     tibble,
     plotly (>= 3.4.1)
-RoxygenNote: 6.0.1
+RoxygenNote: 6.0.1.9000
 VignetteBuilder: knitr
 Collate:
     'annotate_textp.r'
diff --git a/NEWS.md b/NEWS.md
index febeb67..5998a11 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,6 @@
 0.5.0
 =====================
-* `geom_ubar()` : unform bar charts based on `geom_segment()`
+* `geom_ubar()` : uniform bar charts based on `geom_segment()`
 
 0.4.0
 =====================
diff --git a/R/geom_xspline.r b/R/geom_xspline.r
index 62c71ea..5844aaa 100644
--- a/R/geom_xspline.r
+++ b/R/geom_xspline.r
@@ -132,11 +132,13 @@ geom_xspline <- function(mapping = NULL, data = NULL, stat = "xspline",
     position = position,
     show.legend = show.legend,
     inherit.aes = inherit.aes,
-    params = list(spline_shape=spline_shape,
-                  open=open,
-                  na.rm = na.rm,
-                  rep_ends=rep_ends,
-                  ...)
+    params = list(
+      spline_shape = spline_shape,
+      open = open,
+      na.rm = na.rm,
+      rep_ends = rep_ends,
+      ...
+    )
   )
 }
 
@@ -188,6 +190,7 @@ StatXspline <- ggproto("StatXspline", Stat,
 
   compute_group = function(self, data, scales, params,
                            spline_shape=-0.25, open=TRUE, rep_ends=TRUE) {
+
     tf <- tempfile(fileext=".png")
     png(tf)
     plot.new()
@@ -197,4 +200,5 @@ StatXspline <- ggproto("StatXspline", Stat,
 
     data.frame(x=tmp$x, y=tmp$y)
   }
+
 )
diff --git a/man/geom_bkde.Rd b/man/geom_bkde.Rd
index 4ba78f9..b256fd3 100644
--- a/man/geom_bkde.Rd
+++ b/man/geom_bkde.Rd
@@ -59,7 +59,7 @@ rather than combining with them. This is most useful for helper functions
 that define both data and aesthetics and shouldn't inherit behaviour from
 the default plot specification, e.g. \code{\link[=borders]{borders()}}.}
 
-\item{...}{other arguments passed on to \code{\link[=layer]{layer()}}. These are
+\item{...}{Other arguments passed on to \code{\link[=layer]{layer()}}. These are
 often aesthetics, used to set an aesthetic to a fixed value, like
 \code{color = "red"} or \code{size = 3}. They may also be parameters
 to the paired geom/stat.}
diff --git a/man/geom_bkde2d.Rd b/man/geom_bkde2d.Rd
index c5e9575..4601fdb 100644
--- a/man/geom_bkde2d.Rd
+++ b/man/geom_bkde2d.Rd
@@ -50,14 +50,14 @@ results. see \code{\link[KernSmooth]{bkde2D}} for details}
 minimum and maximum values of x at which to compute the estimate for
 each direction. see \code{\link[KernSmooth]{bkde2D}} for details}
 
-\item{lineend}{Line end style (round, butt, square)}
+\item{lineend}{Line end style (round, butt, square).}
 
 \item{contour}{If \code{TRUE}, contour the results of the 2d density
 estimation}
 
-\item{linejoin}{Line join style (round, mitre, bevel)}
+\item{linejoin}{Line join style (round, mitre, bevel).}
 
-\item{linemitre}{Line mitre limit (number greater than 1)}
+\item{linemitre}{Line mitre limit (number greater than 1).}
 
 \item{na.rm}{If \code{FALSE}, the default, missing values are removed with
 a warning. If \code{TRUE}, missing values are silently removed.}
@@ -73,7 +73,7 @@ rather than combining with them. This is most useful for helper functions
 that define both data and aesthetics and shouldn't inherit behaviour from
 the default plot specification, e.g. \code{\link[=borders]{borders()}}.}
 
-\item{...}{other arguments passed on to \code{\link[=layer]{layer()}}. These are
+\item{...}{Other arguments passed on to \code{\link[=layer]{layer()}}. These are
 often aesthetics, used to set an aesthetic to a fixed value, like
 \code{color = "red"} or \code{size = 3}. They may also be parameters
 to the paired geom/stat.}
@@ -89,8 +89,6 @@ specified by range.x are ignored. see \code{\link[KernSmooth]{bkde2D}}
 for details}
 }
 \description{
-Contours from a 2d density estimate.
-
 Perform a 2D kernel density estimation using \code{bkde2D} and display the
 results with contours. This can be useful for dealing with overplotting
 }
diff --git a/man/geom_cartogram.Rd b/man/geom_cartogram.Rd
index e016692..78434c3 100644
--- a/man/geom_cartogram.Rd
+++ b/man/geom_cartogram.Rd
@@ -30,7 +30,7 @@ will be used as the layer data.}
 \item{stat}{The statistical transformation to use on the data for this
 layer, as a string.}
 
-\item{...}{other arguments passed on to \code{\link[=layer]{layer()}}. These are
+\item{...}{Other arguments passed on to \code{\link[=layer]{layer()}}. These are
 often aesthetics, used to set an aesthetic to a fixed value, like
 \code{color = "red"} or \code{size = 3}. They may also be parameters
 to the paired geom/stat.}
diff --git a/man/geom_horizon.Rd b/man/geom_horizon.Rd
index ef91175..4ea85f2 100644
--- a/man/geom_horizon.Rd
+++ b/man/geom_horizon.Rd
@@ -25,8 +25,6 @@ A horizon plot breaks the Y dimension down using colours. This is useful
 when visualising y values spanning a vast range and / or trying to highlight
 outliers without losing context of the rest of the data.\cr \cr Horizon
 plots are best viewed in an apsect ratio of very low vertical length.
-
-Transforms data for a horizon plot
 }
 \section{Aesthetics}{
  \code{x}, \code{y}, \code{fill}. \code{fill} defaults to \code{..band..} which is
diff --git a/man/geom_stateface.Rd b/man/geom_stateface.Rd
index 6124d77..8dc3c02 100644
--- a/man/geom_stateface.Rd
+++ b/man/geom_stateface.Rd
@@ -35,12 +35,12 @@ layer, as a string.}
 \item{position}{Position adjustment, either as a string, or the result of
 a call to a position adjustment function.}
 
-\item{...}{other arguments passed on to \code{\link[=layer]{layer()}}. These are
+\item{...}{Other arguments passed on to \code{\link[=layer]{layer()}}. These are
 often aesthetics, used to set an aesthetic to a fixed value, like
 \code{color = "red"} or \code{size = 3}. They may also be parameters
 to the paired geom/stat.}
 
-\item{parse}{If TRUE, the labels will be parsed into expressions and
+\item{parse}{If \code{TRUE}, the labels will be parsed into expressions and
 displayed as described in ?plotmath}
 
 \item{nudge_x, nudge_y}{Horizontal and vertical adjustment to nudge l
@@ -116,3 +116,4 @@ gg
 Other StateFace operations: \code{\link{load_stateface}},
   \code{\link{show_stateface}}
 }
+\concept{StateFace operations}
diff --git a/man/geom_xspline.Rd b/man/geom_xspline.Rd
index aef2679..daf5e61 100644
--- a/man/geom_xspline.Rd
+++ b/man/geom_xspline.Rd
@@ -62,7 +62,7 @@ closed shape.}
 first and last control points should be replicated for drawing the
 curve. Ignored for closed X-splines.}
 
-\item{...}{other arguments passed on to \code{\link[=layer]{layer()}}. These are
+\item{...}{Other arguments passed on to \code{\link[=layer]{layer()}}. These are
 often aesthetics, used to set an aesthetic to a fixed value, like
 \code{color = "red"} or \code{size = 3}. They may also be parameters
 to the paired geom/stat.}
@@ -195,3 +195,4 @@ Blanc, C. and Schlick, C. (1995), "X-splines : A Spline Model
 
 Other xspline implementations: \code{\link{geom_xspline2}}
 }
+\concept{xspline implementations}
diff --git a/man/geom_xspline2.Rd b/man/geom_xspline2.Rd
index b162c23..3e78430 100644
--- a/man/geom_xspline2.Rd
+++ b/man/geom_xspline2.Rd
@@ -49,7 +49,7 @@ rather than combining with them. This is most useful for helper functions
 that define both data and aesthetics and shouldn't inherit behaviour from
 the default plot specification, e.g. \code{\link[=borders]{borders()}}.}
 
-\item{...}{other arguments passed on to \code{\link[=layer]{layer()}}. These are
+\item{...}{Other arguments passed on to \code{\link[=layer]{layer()}}. These are
 often aesthetics, used to set an aesthetic to a fixed value, like
 \code{color = "red"} or \code{size = 3}. They may also be parameters
 to the paired geom/stat.}
@@ -67,3 +67,4 @@ Other xspline implementations: \code{\link{geom_xspline}}
 \author{
 Ben Bolker
 }
+\concept{xspline implementations}
diff --git a/man/ggplot2-ggproto.Rd b/man/ggplot2-ggproto.Rd
index 2423c4b..c1ccda3 100644
--- a/man/ggplot2-ggproto.Rd
+++ b/man/ggplot2-ggproto.Rd
@@ -8,8 +8,6 @@
 \description{
 If you are creating a new geom, stat, position, or scale in another package,
 you'll need to extend from ggplot2::Geom, ggplot2::Stat, ggplot2::Position, or ggplot2::Scale.
-
-Geom Cartogram
 }
 \seealso{
 \code{\link[ggplot2]{ggplot2-ggproto}}
diff --git a/man/load_stateface.Rd b/man/load_stateface.Rd
index f8c1f95..f1a0d63 100644
--- a/man/load_stateface.Rd
+++ b/man/load_stateface.Rd
@@ -14,3 +14,4 @@ et. al. devices.
 Other StateFace operations: \code{\link{geom_stateface}},
   \code{\link{show_stateface}}
 }
+\concept{StateFace operations}
diff --git a/man/show_stateface.Rd b/man/show_stateface.Rd
index 1fb500f..43f4a8f 100644
--- a/man/show_stateface.Rd
+++ b/man/show_stateface.Rd
@@ -15,3 +15,4 @@ the font on your system
 Other StateFace operations: \code{\link{geom_stateface}},
   \code{\link{load_stateface}}
 }
+\concept{StateFace operations}
diff --git a/man/stat_ash.Rd b/man/stat_ash.Rd
index 0354cd8..eb0924b 100644
--- a/man/stat_ash.Rd
+++ b/man/stat_ash.Rd
@@ -59,7 +59,7 @@ rather than combining with them. This is most useful for helper functions
 that define both data and aesthetics and shouldn't inherit behaviour from
 the default plot specification, e.g. \code{\link[=borders]{borders()}}.}
 
-\item{...}{other arguments passed on to \code{\link[=layer]{layer()}}. These are
+\item{...}{Other arguments passed on to \code{\link[=layer]{layer()}}. These are
 often aesthetics, used to set an aesthetic to a fixed value, like
 \code{color = "red"} or \code{size = 3}. They may also be parameters
 to the paired geom/stat.}
diff --git a/man/stat_stepribbon.Rd b/man/stat_stepribbon.Rd
index e679072..3a1ca81 100644
--- a/man/stat_stepribbon.Rd
+++ b/man/stat_stepribbon.Rd
@@ -50,7 +50,7 @@ the default plot specification, e.g. \code{\link[=borders]{borders()}}.}
 \item{direction}{\code{hv} for horizontal-veritcal steps, `vh`` for
 vertical-horizontal steps}
 
-\item{...}{other arguments passed on to \code{\link[=layer]{layer()}}. These are
+\item{...}{Other arguments passed on to \code{\link[=layer]{layer()}}. These are
 often aesthetics, used to set an aesthetic to a fixed value, like
 \code{color = "red"} or \code{size = 3}. They may also be parameters
 to the paired geom/stat.}