Fixed the major contract feature problems