minor cleanups, require encryption!