2.1.7.0: Restraint, many minor improvements