API renamings (shortenings) and minor API simplifications. Doc updates, some work on making the R-card optional.