Added invariants, enlarged margins