Oerpub ticket414 pull

Reimplement cheatsheet as a separate plugin. Also fixes two other minor issues.