Added & fixed contracts!