Added contract to property-layer% class. Modified main formatting.