Instrumentation and invariants

(finally) included Instrumentation and invariants, closing #33