Many things, but mostly rubric support

Fixes some stuff, but of most consequences adds better support for rubrics.