Added contract labels. Added better reporting for function return values.