Feature/flesh out constraints

Based on PR #81.

Flesh out some constraints and fix some backticks.