contact fixes, style fixes