Contact system fixes, random standardization
That was supposed to be like that @encadyma.